projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2b8e5e
)
applications/luci_splash: Do not try to get parent interfaces for bridges
author
Manuel Munz
<
[email protected]
>
Sat, 9 Feb 2013 16:55:35 +0000
(16:55 +0000)
committer
Manuel Munz
<
[email protected]
>
Sat, 9 Feb 2013 16:55:35 +0000
(16:55 +0000)
applications/luci-splash/root/etc/init.d/luci_splash
patch
|
blob
|
history
diff --git
a/applications/luci-splash/root/etc/init.d/luci_splash
b/applications/luci-splash/root/etc/init.d/luci_splash
index d4d3870ff56d3a69e304693d426683128606a561..0d21bf50b28d2cda043f97ae9f0e5a06ccdf4dff 100755
(executable)
--- a/
applications/luci-splash/root/etc/init.d/luci_splash
+++ b/
applications/luci-splash/root/etc/init.d/luci_splash
@@
-36,10
+36,12
@@
iface_add() {
config_get netmask "$net" netmask
[ -n "$netmask" ] || return 0
+ config_get type "$net" type
+
parentiface="$(uci -q get network.${net}.ifname)"
- parentiface=${parentiface#@}
- [ -n "$parentiface" ] && {
+ [ -n "$parentiface" ] && [ ! "$type" = "bridge" ] && {
+ parentiface=${parentiface#@}
config_get parentproto "$parentiface" proto
config_get parentipaddr "$parentiface" ipaddr
config_get parentnetmask "$parentiface" netmask